merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 5 Sep 2012 01:26:02 +0000 (10:26 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 5 Sep 2012 01:26:02 +0000 (10:26 +0900)
commit348932c4aad70fe4b6d50bbf381af003f2038ed9
treeaa2353ca2b105ec5e409d6d7a511ec000ffb0f76
parent488f5a5e7fd1b8917d639cd9fba64720dfb8ee02
parent301a9e73cb4ad57639236aac18f4abef1f3b35a9
merge trunk